auto merge of #487 : Insanity133/cargo/patch-2, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 30 Aug 2014 02:44:07 +0000 (02:44 +0000)
committerbors <bors@rust-lang.org>
Sat, 30 Aug 2014 02:44:07 +0000 (02:44 +0000)
This is a fixed version of PR #478 on the gh-pages branch.


Trivial merge